remove almost all references to stderr; make them all either fatal() or warning()

diff --git a/gpsbabel/arcdist.c b/gpsbabel/arcdist.c
index 6bf7694470275253727b2c61aee47b9b822f7acc..2e21ae904d741b50620331df6166db7413dba17c 100644 (file)
--- a/gpsbabel/arcdist.c
+++ b/gpsbabel/arcdist.c
@@ -194,7 +194,7 @@ arcdist_process(void)
            argsfound = sscanf( line, "%lf %lf", &lat2, &lon2 );
           
            if ( argsfound != 2 && strspn(line, " \t\n") < strlen(line)) {
-                fprintf( stderr, "%s: Warning: Arc file contains unusable vertex on line %d.\n", MYNAME, fileline );
+                warning(MYNAME ": Warning: Arc file contains unusable vertex on line %d.\n", fileline );
            } 
            else if ( lat1 != BADVAL && lon1 != BADVAL &&
                 lat2 != BADVAL && lon2 != BADVAL ) {

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index f358626c2f0c0e9a3d1115971d66532a2dce927f..77ebc90df23e0c65fc1d20b7627aa3870c87689a 100644 (file)
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -221,8 +221,9 @@ csv_lineparse(const char *stringstart, const char *delimited_by,
     }
 
     if (enclosedepth != 0) {
-       fprintf(stderr, "%s: Warning- Unbalanced Field Enclosures (%s) on line %d\n",
-               MYNAME, enclosed_in, line_no);
+       warning(MYNAME 
+               ": Warning- Unbalanced Field Enclosures (%s) on line %d\n",
+               enclosed_in, line_no);
     }
 
     return (tmp);
@@ -493,7 +494,7 @@ xcsv_parse_val(const char *s, waypoint *wpt, const field_map_t *fmp)
        /* wpt->gc_data.type = gs_mktype(s);*/
 
     } else {
-       fprintf (stderr, "UNKNOWN STYLE DIRECTIVE: %s\n", fmp->key);
+       warning( MYNAME ": Unknown style directive: %s\n", fmp->key);
     }
 }
 

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 273183b3f45e0c720be742f038e2b9f8f982736d..cbccd786314ca09147c41bbe85cf3d00c8cc5269 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -285,7 +285,11 @@ void fatal(const char *, ...)
        __attribute__ ((__format__ (__printf__, 1, 2)))
 #endif
        ;
-
+void warning(const char *, ...)
+#if __GNUC__
+       __attribute__ ((__format__ (__printf__, 1, 2)))
+#endif
+       ;
 ff_vecs_t *find_vec(char *, char **);
 void disp_vecs(void);
 void disp_formats(int version);

diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.c
index 74be7d46a7e5d7016ae1dbf7745b03d2e3d05680..eb0c01a86a5a8834612ac7c836d643b949b46540 100644 (file)
--- a/gpsbabel/gcdb.c
+++ b/gpsbabel/gcdb.c
@@ -177,7 +177,7 @@ data_read(void)
                                        tm = be_read32(recdata) * 24 * 3600;
                                        tm -= EPOCH_1904;
                                        wpt->creation_time = tm;
-                                       fprintf(stderr, "date %d\n", tm);
+                                       warning( "date %d\n", tm);
                                }
                                break;
 #endif

diff --git a/gpsbabel/gpsdrive.c b/gpsbabel/gpsdrive.c
index fa18191e6cd375599772a11b816738d92880aa7e..2db56a99b0901a4aa554a45578167a175f6737bc 100644 (file)
--- a/gpsbabel/gpsdrive.c
+++ b/gpsbabel/gpsdrive.c
@@ -112,8 +112,9 @@ data_read(void)
                                wpt_tmp->icon_descr_is_dynamic = 1;
                                break;
                        default:
-                           fprintf (stderr, "%s: Warning: unmapped data fields on line %d.\n", 
-                               MYNAME, linecount);
+                           warning(MYNAME 
+                               ": Warning: unmapped data fields on line %d.\n", 
+                               linecount);
                            break;
                        }
                        i++;

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index 90d66e07d974afdc063d72a97f88104a65694b6d..b9b3af6be06b1684b5fffce9246de4b293908bb9 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -256,7 +256,7 @@ mag_writemsg(const char * const buf)
        char obuf[1000];
 
        if (debug_serial) {
-               fprintf(stderr,"WRITE: $%s*%02X\r\n",buf, osum);
+               warning("WRITE: $%s*%02X\r\n",buf, osum);
        }
 
     retry:
@@ -268,7 +268,7 @@ mag_writemsg(const char * const buf)
                mag_readmsg();
                if (last_rx_csum != osum) {
                        if (debug_serial) {
-                               fprintf(stderr, "COMM ERROR: Expected %02x, got %02x", 
+                               warning("COMM ERROR: Expected %02x, got %02x", 
                                                osum, last_rx_csum);
                        }
                        if (retry_cnt--)
@@ -299,7 +299,7 @@ mag_writeack(int osum)
        i = sprintf(obuf, "$%s*%02X\r\n",nbuf, nsum);
 
        if (debug_serial) {
-               fprintf(stderr,"ACK WRITE: %s",obuf);
+               warning("ACK WRITE: %s",obuf);
        }
        /*
         * Don't call mag_writemsg here so we don't get into ack feedback
@@ -386,7 +386,7 @@ retry:
                         * we'll be fairly persistent in retrying.
                         */
                        if (retrycnt--) {
-                               fprintf(stderr, "%d\n", retrycnt);
+                               warning( "%d\n", retrycnt);
                                goto retry;
                        } else {
                                fatal(MYNAME ": No data received from GPS.\n");
@@ -403,7 +403,7 @@ retry:
 
        if (isz < 5) {
                if (debug_serial)
-                       fprintf(stderr, "SHORT READ %d\n", isz);
+                       warning( "SHORT READ %d\n", isz);
                return;
        }
        mag_error = 0;
@@ -413,14 +413,14 @@ retry:
        isum  = strtoul(isump, NULL,16); 
        if (isum != mag_pchecksum(&ibuf[1], isz-3)) {
                if (debug_serial)
-                       fprintf(stderr, "RXERR %02x/%02x: '%s'\n", isum, mag_pchecksum(&ibuf[1],isz-5), ibuf);
+                       warning( "RXERR %02x/%02x: '%s'\n", isum, mag_pchecksum(&ibuf[1],isz-5), ibuf);
                        /* Special case receive errors early on. */
                if (!got_version) {
                        fatal(MYNAME ": bad communication.  Check bit rate.\n");
                }
        }
        if (debug_serial) {
-               fprintf(stderr, "READ: %s\n", ibuf);
+               warning( "READ: %s\n", ibuf);
        }
        if (IS_TKN("$PMGNCSM,")) {
                last_rx_csum = strtoul(&ibuf[9], NULL, 16);
@@ -453,7 +453,7 @@ retry:
        } 
        mag_error = 0;
        if (!ignore_unable && IS_TKN("$PMGNCMD,UNABLE")) {
-               fprintf(stderr, "Unable to send\n");
+               warning( "Unable to send\n");
                found_done = 1;
                mag_error = 1;
                ignore_unable = 0;
@@ -1180,7 +1180,7 @@ mag_waypt_pr(const waypoint *waypointp)
 
        if (!is_file) {
                if (mag_error) {
-                       fprintf(stderr, "Protocol error Writing '%s'\n", obuf);
+                       warning( "Protocol error Writing '%s'\n", obuf);
                }
        }
 }

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index 65691bec263e3e38cb90cf89d858830662f9a0b7..d1cb83b7e465ebae7fca34a551742084648c186b 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -58,8 +58,7 @@ mapsend_rd_init(const char *fname, const char *args)
 {
        mapsend_file_in = fopen(fname, "rb");
        if (mapsend_file_in == NULL) {
-               fprintf(stderr, "Cannot open '%s' for reading\n", fname);
-               exit(1);
+               fatal( MYNAME ": Cannot open '%s' for reading\n", fname);
        }
 }
 
@@ -174,8 +173,7 @@ mapsend_wr_init(const char *fname, const char *args)
 {
        mapsend_file_out = fopen(fname, "wb");
        if (mapsend_file_out == NULL) {
-               fprintf(stderr, "Cannot open '%s' for writing\n", fname);
-               exit(1);
+               fatal(MYNAME ": Cannot open '%s' for writing\n", fname);
        }
        mkshort_handle = mkshort_new_handle();
        route_wp_count = 0;

diff --git a/gpsbabel/polygon.c b/gpsbabel/polygon.c
index 4386cad18d33692a87c97483142ae5e313d848df..411484386f02759cd30b7eb9b3d230baf091ee6d 100644 (file)
--- a/gpsbabel/polygon.c
+++ b/gpsbabel/polygon.c
@@ -219,7 +219,9 @@ polygon_process(void)
            argsfound = sscanf( line, "%lf %lf", &lat2, &lon2 );
           
            if ( argsfound != 2 && strspn(line, " \t\n") < strlen(line)) {
-                fprintf( stderr, "%s: Warning: Polygon file contains unusable vertex on line %d.\n", MYNAME, fileline );
+                warning(MYNAME 
+                   ": Warning: Polygon file contains unusable vertex on line %d.\n", 
+                   fileline );
            } 
            else if ( lat1 != BADVAL && lon1 != BADVAL &&
                 lat2 != BADVAL && lon2 != BADVAL ) {

diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c
index 32bc6f812f3430a884930c08b0c51a53d91a2875..50dc1619d1869a9ebcaba1672e95917aa47b8c5e 100644 (file)
--- a/gpsbabel/tmpro.c
+++ b/gpsbabel/tmpro.c
@@ -151,8 +151,8 @@ data_read(void)
                        break;
                default:
                    /* whoa! nelly */
-                   fprintf (stderr, "%s: Warning: data fields on line %d exceed specification.\n", 
-                       MYNAME, linecount);
+                   warning(MYNAME ": Warning: data fields on line %d exceed specification.\n", 
+                       linecount);
                    break;
                }
                i++;
@@ -162,8 +162,8 @@ data_read(void)
            
            if (i != 11) {
                xfree(wpt_tmp);
-               fprintf (stderr, "%s: WARNING - extracted %d fields from line %d. \nData on line ignored.\n", 
-                   MYNAME, i, linecount);
+               warning(MYNAME ": WARNING - extracted %d fields from line %d. \nData on line ignored.\n", 
+                   i, linecount);
            } else {
                waypt_add(wpt_tmp);
            }

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 2f9c98256d9ea7d91f2c29725d1488a5cdd3c646..415b2344087c0b35109edfcfc0cb1aadcfe6334b 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -308,6 +308,14 @@ fatal(const char *fmt, ...)
        exit(1);
 }
 
+void
+warning(const char *fmt, ...)
+{
+       va_list ap;
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+}
+
 /*
  * Read 4 bytes in big-endian.   Return as "int" in native endianness.
  */